Skip to content

python upstream merge v2025.6.1 #7811

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
May 28, 2025
Merged

python upstream merge v2025.6.1 #7811

merged 6 commits into from
May 28, 2025

Conversation

isabelizimm
Copy link
Contributor

@isabelizimm isabelizimm commented May 22, 2025

from v2025.4.0 -> v2025.6.1

Nothing too exciting here beyond loads of package-lock.json changes (all but ~700 changed lines 😩). Some pyrefly testing, updates to the unittest adapter, etc. I'll add comments to the interesting bits!

Release Notes

New Features

  • N/A

Bug Fixes

QA Notes

Should pass tests!

Copy link

github-actions bot commented May 22, 2025

E2E Tests 🚀
This PR will run tests tagged with: @:critical

readme  valid tags

Copy link
Contributor Author

@isabelizimm isabelizimm left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

about 11.5k of the 12k changes are the package-lock.json

apart from that, the main bits that are sort of interesting:

  • adding in pyrefly compatability testing
  • moving min version 3.8 -> 3.9
  • some new testing fixtures, not sure if we would want to use MockExtensions at all for checking cross-extension compatability?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i've never seen anything quite like this in a PR, neat!

@@ -317,7 +317,7 @@ def write_output(
if __name__ == "__main__":
main(
requirement="ipykernel",
python_versions=["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
python_versions=["3.9", "3.10", "3.11", "3.12", "3.13"],
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

are we good to drop 3.8 here?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so! Missed one in #6856 I guess

@@ -310,7 +314,14 @@ export class PythonSettings implements IPythonSettings {
userLS === 'Microsoft' ||
!Object.values(LanguageServerType).includes(userLS as LanguageServerType)
) {
this.languageServer = this.defaultLS?.defaultLSType ?? LanguageServerType.None;
if (
this.extensions.getExtension(PYREFLY_EXTENSION_ID) &&
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pyrefly starting to be added into tests/extension


// --- Start Positron ---
// We are using Jedi as the default language server, and it is not configurable.
suite.skip('pyrefly languageServer settings', async () => {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we're skipping pyrefly tests for now, since the LSP is not configurable in Positron

@isabelizimm isabelizimm marked this pull request as ready for review May 23, 2025 14:16
austin3dickey
austin3dickey previously approved these changes May 23, 2025
Copy link
Contributor

@austin3dickey austin3dickey left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM thanks!

@@ -317,7 +317,7 @@ def write_output(
if __name__ == "__main__":
main(
requirement="ipykernel",
python_versions=["3.8", "3.9", "3.10", "3.11", "3.12", "3.13"],
python_versions=["3.9", "3.10", "3.11", "3.12", "3.13"],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think so! Missed one in #6856 I guess

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be interesting to try out this coverage stuff on our fork sometime!

@@ -94,6 +94,9 @@ export class JediLanguageServerAnalysisOptions extends LanguageServerAnalysisOpt
maxSymbols: 0,
},
},
semantic_tokens: {
enable: true,
},
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, cool, hopefully pappasam/jedi-language-server#340 is fixed soon

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm maybe we should comment this change out until that issue is fixed

@isabelizimm isabelizimm requested a review from austin3dickey May 27, 2025 16:59
@isabelizimm isabelizimm merged commit 7ad8241 into main May 28, 2025
28 checks passed
@isabelizimm isabelizimm deleted the vscode-python-v2025.6.1 branch May 28, 2025 14:46
@github-actions github-actions bot locked and limited conversation to collaborators May 28, 2025
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants